bitkeeper revision 1.1159.1.266 (417a3d98CeFiS9Vj2SKKSNciHhZF2g)

Sanitise the Linux version numbers. No stupid pathname magic.

diff --git a/Makefile b/Makefile
index c3cba553bf726d30bf2a09319ea88214c20140d0..e1b40cc89b90abb99bccda5ec2b163edf9a36d05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,28 +80,28 @@ endif
 CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
 ifeq ($(LINUX_RELEASE),2.4)
 config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen mrproper
-       cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
+       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
+       cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \
            $(CDIR)/.config || \
-           $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
-       $(MAKE) -C $(CDIR) ARCH=xen oldconfig
-       $(MAKE) -C $(CDIR) ARCH=xen dep
+           $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_config
+       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) oldconfig
+       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) dep
 else
 config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen mrproper
+       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
        @[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
          && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
                $(CDIR)/.config || \
-       $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig
+       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_defconfig
 endif
 
 # build the specified linux tree
 BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
 linux-xen%:    
-       $(MAKE) -C $(BDIR) ARCH=xen modules
-       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \
+       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) modules
+       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_MOD_PATH=$(INSTALL_DIR) \
            modules_install
-       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_PATH=$(INSTALL_DIR) install
 
 
 NETBSD_RELEASE   ?= 2.0

diff --git a/linux-2.4.27-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile
index 8a8aaf6232c0f4745373f489519be84cae00434c..247ae7b379b9ef2abbda0498ebb846e5945e9e10 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile
@@ -16,7 +16,8 @@
 #           Added '-march' and '-mpreferred-stack-boundary' support
 #
 
-override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
+XENVERSION   ?= -xen
+EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
 
 # If no .config file exists then use the appropriate defconfig-* file
 ifneq (.config,$(wildcard .config))

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
index e6d2270de2171e99a0dd375a4b60ac5d919f5ca1..6d234a8bb72170fa2705b4b2f61b551da784088e 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
@@ -12,8 +12,8 @@
 # Copyright (C) 2004 by Christian Limpach
 #
 
-EXTRAEXTRAVERSION=$(subst $(findstring $(EXTRAVERSION),$(shell basename $(TOPDIR))),,$(EXTRAVERSION))
-override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAEXTRAVERSION)
+XENVERSION   ?= -xen
+EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
 
 XENARCH        := $(subst ",,$(CONFIG_XENARCH))